Usenet 1993 July

home *** CD-ROM | disk | FTP | other *** search

/ Usenet 1993 July / InfoMagic USENET CD-ROM July 1993.ISO / sources / misc / volume23 / sc / patch03 next >

Wrap

Text File | 1991-10-16 | 31.6 KB | 1,218 lines

Newsgroups: comp.sources.misc From: uunet!sawmill!prslnk!buhrt (Jeff Buhrt) Subject: v23i035: sc - The SC Spreadsheet, Patch03 Message-ID: <1991Sep29.034302.11419@sparky.imd.sterling.com> X-Md4-Signature: ca51f8df5c63c2b7f36cabdc6580bc8d Date: Sun, 29 Sep 1991 03:43:02 GMT Approved: kent@sparky.imd.sterling.com Submitted-by: uunet!sawmill!prslnk!buhrt (Jeff Buhrt) Posting-number: Volume 23, Issue 35 Archive-name: sc/patch03 Environment: UNIX, VMS, MS-DOS Patch-To: sc: Volume 20, Issue 35-41 Requires: Sc6.16, patch 01 and patch 02 be applied first. This is a SHAR archive that MUST BE extracted before applying pch618-619 to Sc6.18 to get the file build.com, the new revision level will be: 6.19. To see what this changes see CHANGES down about 30 lines. This fixes an overlooked possible NULL pointer, adds VMS support, and a few new features. -Jeff Buhrt {sequent,uunet}!sawmill!prslnk!buhrt 812-275-0750 work Proslink, Inc. ---- #!/bin/sh # This is a shell archive (shar 3.20) # made 09/26/1991 20:23 UTC by buhrt@prslnk # Source directory /u/buhrt/src/sc # # existing files WILL be overwritten # # This shar contains: # length mode name # ------ ---------- ------------------------------------------ # 27397 -rw-rw-rw- pch618-619 # 1437 -r--r--r-- build.com # if touch 2>&1 | fgrep '[-amc]' > /dev/null then TOUCH=touch else TOUCH=true fi # ============= pch618-619 ============== echo "x - extracting pch618-619 (Text)" sed 's/^X//' << 'SHAR_EOF' > pch618-619 && X*** 618/CHANGES Thu Sep 26 10:39:38 1991 X--- CHANGES Thu Sep 26 10:17:08 1991 X*************** X*** 1,3 **** X--- 1,20 ---- X+ CHANGES BETWEEN 6.19 and 6.18 X+ Tom Tkacik X+ -sc.doc and CHANGES changes X+ Edgard X+ -moving right off the screen now redraws vs optimize X+ Sisira Jayasinghe X+ - added build.com (VMS) and VMS fixes X+ Jonathan I. Kamen && Charlie Shub X+ -noted fmod doesn't exist on BSD4.3 and Mt Xinu X+ Ben Priest X+ -vi compatability: ' ' moves right as well as 'l' while line editing X+ Jeff Buhrt X+ -one more possible NULL pointer fixed X+ -added NONOTIMEOUT for those that don't have notimeout() in curses X+ -undef CRYPT=-DCRYPT_PATH... if crypt isn't available X+ -merged simple fmod into interp.c if fmod() is not present X+ X CHANGES BETWEEN 6.18 and 6.17 X James Dugal X - NULL pointer fix for is_locked X*** 618/README Thu Sep 26 10:39:38 1991 X--- README Thu Sep 26 10:47:05 1991 X*************** X*** 1,9 **** X This is a much modified version of the public domain spread sheet sc, X posted several years ago by Mark Weiser as vc, originally by James Gosling. X X! CHANGES lists the changes since 6.1 to 6.18. X! Sc6.16 was released to comp.sources.misc and two sets of patches X! bring Sc6.16->6.17->6.18. X X Current maintainer: {sequent, uunet}!sawmill!prslnk!buhrt (Jeff Buhrt) X X--- 1,9 ---- X This is a much modified version of the public domain spread sheet sc, X posted several years ago by Mark Weiser as vc, originally by James Gosling. X X! CHANGES lists the changes since 6.1 to 6.19. X! Sc6.16 was released to comp.sources.misc and three sets of patches X! bring Sc6.16->6.17->6.18->6.19. X X Current maintainer: {sequent, uunet}!sawmill!prslnk!buhrt (Jeff Buhrt) X X*************** X*** 72,78 **** X X Archives: X 1) (FTP) jpd@usl.edu James Dugal X! pc.usl.edu X X 2) (UUCP) marc@dumbcat.sf.ca.us (Marco S Hyman) X dumbcat Any ACU 9600 14157850194 "" \d\r in:--in: nuucp word: guest X--- 72,78 ---- X X Archives: X 1) (FTP) jpd@usl.edu James Dugal X! pc.usl.edu in the pub/unix directory X X 2) (UUCP) marc@dumbcat.sf.ca.us (Marco S Hyman) X dumbcat Any ACU 9600 14157850194 "" \d\r in:--in: nuucp word: guest X*** 618/sc.doc Thu Sep 26 10:39:40 1991 X--- sc.doc Thu Sep 26 10:17:15 1991 X*************** X*** 15,21 **** X .\" - TPs use default indent except for function names, then 18. X .\" - Smallify uppercase strings. X .\" - Avoid passive voice and third person. X! .\" $Revision: 6.18 $ X .\" X .TH PNAME\ #REVISION#\ 1 X .SH NAME X--- 15,21 ---- X .\" - TPs use default indent except for function names, then 18. X .\" - Smallify uppercase strings. X .\" - Avoid passive voice and third person. X! .\" $Revision: 6.19 $ X .\" X .TH PNAME\ #REVISION#\ 1 X .SH NAME X*************** X*** 263,269 **** X A constant string may be preceeded with a backslash (`\\'). X In this case the constant string will be used as a ``wheel'' X to fill a column, e.g. "\\-" for a line in a column, X! and "\\Yeh " for "Yeh Yeh Ye". X If the cell has a numeric value, X it follows as X .RI [ value ], X--- 263,269 ---- X A constant string may be preceeded with a backslash (`\\'). X In this case the constant string will be used as a ``wheel'' X to fill a column, e.g. "\\-" for a line in a column, X! and "\\Yeh\ " for "Yeh\ Yeh\ Ye". X If the cell has a numeric value, X it follows as X .RI [ value ], X*************** X*** 469,474 **** X--- 469,475 ---- X If the character cursor is not on the top line, these are alternate, X .IR vi -compatible X cell cursor controls (left, down, up, right). X+ Space is just like l (right). X .TP X .B "H, J, K, L" X If the character cursor is not on the top line, these move the cursor X*************** X*** 626,632 **** X to be flushed left against the left edge of the cell. X .\" ---------- X .IP \fB"\fP X- .PD 0 X Enter a label string into the current cell X to be centered in the column. X .\" ---------- X--- 627,632 ---- X*************** X*** 635,641 **** X Enter a label string into the current cell X to be flushed right against the right edge of the cell. X .\" ---------- X- .PD X .TP X .B F X Enter a format string into the current cell. This format string X--- 635,640 ---- X*************** X*** 751,757 **** X .BR TAB X Mark && append a range (ex: A0:A0) X .br X! TAB, move around w/i a range; TAB, append range string. X .TP X .BR CR X Save X--- 750,756 ---- X .BR TAB X Mark && append a range (ex: A0:A0) X .br X! TAB, move around within a range; TAB, append range string. X .TP X .BR CR X Save X*************** X*** 765,771 **** X .BR / X Search for a string in the history X .RS X! \fBESC\fP edit the you typed X .br X \fBCR\fP search X .br X--- 764,770 ---- X .BR / X Search for a string in the history X .RS X! \fBESC\fP edit the string you typed X .br X \fBCR\fP search X .br X*************** X*** 1782,1788 **** X overflows. X .\" ---------- X .TP 18 X! .B pi X A constant quite close to pi. X .\" ---------- X .TP 18 X--- 1781,1787 ---- X overflows. X .\" ---------- X .TP 18 X! .B pi\ \ @pi X A constant quite close to pi. X .\" ---------- X .TP 18 X*************** X*** 2232,2238 **** X Jim Clausing, X Dave Close, X Chris Cole, X! Jonathan Crompron X David I. Dalva, X Glen Ditchfield, X Sam Drake, X--- 2231,2237 ---- X Jim Clausing, X Dave Close, X Chris Cole, X! Jonathan Crompron, X David I. Dalva, X Glen Ditchfield, X Sam Drake, X*************** X*** 2241,2247 **** X Andy Fyfe, X Jack Goral, X Piercarlo "Peter" Grandi, X! Henk Hesselink X Jeffrey C Honig, X Kurt Horton, X Jonathan I. Kamens, X--- 2240,2246 ---- X Andy Fyfe, X Jack Goral, X Piercarlo "Peter" Grandi, X! Henk Hesselink, X Jeffrey C Honig, X Kurt Horton, X Jonathan I. Kamens, X*************** X*** 2248,2255 **** X Peter King, X Tom Kloos, X Casey Leedom, X! Jay Lepreau X! Dave Lewis, X Rick Linck, X Soren Lundsgaard, X Tad Mannes, X--- 2247,2254 ---- X Peter King, X Tom Kloos, X Casey Leedom, X! Jay Lepreau, X! Dave Lewis, X Rick Linck, X Soren Lundsgaard, X Tad Mannes, X*** 618/psc.doc Thu Sep 26 10:38:45 1991 X--- psc.doc Thu Sep 26 10:34:28 1991 X*************** X*** 1,4 **** X! .\" $Revision $ X .TH PPNAME\ #REVISION#\ 1 X .SH NAME X ppname \- prepare pname files X--- 1,4 ---- X! .\" $ Revision $ X .TH PPNAME\ #REVISION#\ 1 X .SH NAME X ppname \- prepare pname files X*** 618/Makefile Thu Sep 26 10:38:46 1991 X--- Makefile Thu Sep 26 15:21:26 1991 X*************** X*** 1,7 **** X! # Makefile $Revision: 6.17 $ X # X # 1) Select the proper EXDIR (path), MANDIR, MANEXT, LIBDIR, SIGVOID, X! # RE_COMP/REGCMP, and DFLT_PAGER. Most of the other things aren't X # normally changed (see the comments with each) X # 2) Select the proper machine/compiler/OS section of code X # for MS-DOS look for the pattern 'MS-DOS' X--- 1,7 ---- X! # Makefile $Revision: 6.19 $ X # X # 1) Select the proper EXDIR (path), MANDIR, MANEXT, LIBDIR, SIGVOID, X! # RE_COMP/REGCMP, DFLT_PAGER, and FMOD. Most of the other things aren't X # normally changed (see the comments with each) X # 2) Select the proper machine/compiler/OS section of code X # for MS-DOS look for the pattern 'MS-DOS' X*************** X*** 88,94 **** X # this is the name to save back ups in X SAVE=-DSAVENAME=\"$(NAME).SAVE\" X X! # path to crypt X # most systems X CRYPT=-DCRYPT_PATH=\"/bin/crypt\" X # BSD X--- 88,94 ---- X # this is the name to save back ups in X SAVE=-DSAVENAME=\"$(NAME).SAVE\" X X! # path to crypt, do not define if you don't have crypt X # most systems X CRYPT=-DCRYPT_PATH=\"/bin/crypt\" X # BSD X*************** X*** 96,101 **** X--- 96,110 ---- X # other people? X #CRYPT=CRYPT_PATH=\"/usr/local/bin/crypt\" X X+ # If you get errors about fmod being undefined when you try to X+ # compile, then define NO_FMOD (most likely BSD4.3 and Mt Xinu). X+ #FMOD=-DNO_FMOD X+ FMOD= X+ X+ # If your system doesn't have notimeout() in curses define NONOTIMEOUT X+ NONOTIMEOUT= X+ #NONOTIMEOUT=-DNONOTIMEOUT X+ X # flags for lint X LINTFLAGS=-abchxv X X*************** X*** 122,127 **** X--- 131,142 ---- X IDLOKBAD=-DIDLOKBAD X #IDLOKBAD= X X+ # If moving right off the screen causes the screen to not redraw X+ # properly, define RIGHT_CBUG to get around a curses problem on some X+ # boxes, this forces screen redraws when going right off the screen X+ RIGHTBUG= X+ #RIGHTBUG=-DRIGHT_CBUG X+ X # IF you have problems w/ your yacc try bison, Berkeley yacc, or X # some other yacc. Some systems don't allow you to X # increase the number of terminals (mostly AT&T), SCO's does though. X*************** X*** 260,266 **** X screen.o version.o vi.o vmtbl.o xmalloc.o X X # The documents in the Archive X! DOCS=CHANGES README sc.doc psc.doc tutorial.sc VMS_NOTES torev X X all: $(name) p$(name) $(name)qref X X--- 275,281 ---- X screen.o version.o vi.o vmtbl.o xmalloc.o X X # The documents in the Archive X! DOCS=CHANGES README sc.doc psc.doc tutorial.sc VMS_NOTES torev build.com X X all: $(name) p$(name) $(name)qref X X*************** X*** 307,313 **** X # Objects X X cmds.o: cmds.c sc.h X! $(CC) ${CFLAGS} ${DOBACKUPS} -c cmds.c X X crypt.o: crypt.c sc.h X $(CC) ${CFLAGS} ${CRYPT} ${DOBACKUPS} -c crypt.c X--- 322,328 ---- X # Objects X X cmds.o: cmds.c sc.h X! $(CC) ${CFLAGS} ${DOBACKUPS} ${CRYPT} -c cmds.c X X crypt.o: crypt.c sc.h X $(CC) ${CFLAGS} ${CRYPT} ${DOBACKUPS} -c crypt.c X*************** X*** 315,323 **** X format.o: format.c X X help.o: help.c sc.h X X interp.o: interp.c sc.h X! $(CC) ${CFLAGS} ${IEEE_MATH} ${SIGVOID} ${RINT} ${RE_COMP} ${REGCMP} -c interp.c X X gram.o: sc.h y.tab.h gram.c X $(CC) ${CFLAGS} -c gram.c X--- 330,342 ---- X format.o: format.c X X help.o: help.c sc.h X+ $(CC) ${CFLAGS} ${CRYPT} -c help.c X+ X+ qhelp.o: qhelp.c sc.h X+ $(CC) ${CFLAGS} ${CRYPT} -c qhelp.c X X interp.o: interp.c sc.h X! $(CC) ${CFLAGS} ${IEEE_MATH} ${SIGVOID} ${RINT} ${RE_COMP} ${REGCMP} ${FMOD} -c interp.c X X gram.o: sc.h y.tab.h gram.c X $(CC) ${CFLAGS} -c gram.c X*************** X*** 325,331 **** X sed < gram.y > statres.h -f sres.sed X X lex.o: sc.h y.tab.h gram.o lex.c X! $(CC) ${CFLAGS} ${SIMPLE} ${IEEE_MATH} ${SIGVOID} -c lex.c X X pxmalloc.o: sc.h pxmalloc.c X $(CC) ${CFLAGS} -c -DPSC pxmalloc.c X--- 344,350 ---- X sed < gram.y > statres.h -f sres.sed X X lex.o: sc.h y.tab.h gram.o lex.c X! $(CC) ${CFLAGS} ${SIMPLE} ${IEEE_MATH} ${SIGVOID} ${NONOTIMEOUT} -c lex.c X X pxmalloc.o: sc.h pxmalloc.c X $(CC) ${CFLAGS} -c -DPSC pxmalloc.c X*************** X*** 377,383 **** X name=$(name) NAME=$(NAME) LIBDIR=$(LIBDIR) sh torev sc.doc > $(name).1 X # sed -e s/pname/$(name)/g -e s/PNAME/$(NAME)/g \ X # -e s%#LIBDIR#%$(LIBDIR)%g sc.doc > $(name).1 X! # REVISION=`sed -e '/Revision/!D' -e 's/.*$Revision: 6.17 $( X # sed -e s/pname/$(name)/g -e s/PNAME/$(NAME)/g \ X # -e s%#LIBDIR#%$(LIBDIR)%g \ X # -e 's/#REVISION#/$(REVISION)/' sc.doc > $(name).1 X--- 396,402 ---- X name=$(name) NAME=$(NAME) LIBDIR=$(LIBDIR) sh torev sc.doc > $(name).1 X # sed -e s/pname/$(name)/g -e s/PNAME/$(NAME)/g \ X # -e s%#LIBDIR#%$(LIBDIR)%g sc.doc > $(name).1 X! # REVISION=`sed -e '/Revision/!D' -e 's/.*$Revision: 6.19 $( X # sed -e s/pname/$(name)/g -e s/PNAME/$(NAME)/g \ X # -e s%#LIBDIR#%$(LIBDIR)%g \ X # -e 's/#REVISION#/$(REVISION)/' sc.doc > $(name).1 X*************** X*** 429,435 **** X diffs: ${SRC} X for i in ${DOCS} ${SRC} ;\ X do \ X! rcsdiff -c -r6.16 $$i ;\ X done X X # THA 10/14/90 Added code to make a patchfile X--- 448,454 ---- X diffs: ${SRC} X for i in ${DOCS} ${SRC} ;\ X do \ X! rcsdiff -c -r6.18 $$i ;\ X done X X # THA 10/14/90 Added code to make a patchfile X*** 618/cmds.c Thu Sep 26 10:39:42 1991 X--- cmds.c Thu Sep 26 10:17:26 1991 X*************** X*** 7,13 **** X * X * More mods Robert Bond, 12/86 X * X! * $Revision: 6.18 $ X */ X X #include <sys/types.h> X--- 7,13 ---- X * X * More mods Robert Bond, 12/86 X * X! * $Revision: 6.19 $ X */ X X #include <sys/types.h> X*************** X*** 20,26 **** X #endif X X #include <curses.h> X! #if defined(BSD42) || defined(BSD43) X #include <sys/file.h> X #else X #include <fcntl.h> X--- 20,26 ---- X #endif X X #include <curses.h> X! #if defined(BSD42) || defined(BSD43) || defined(VMS) X #include <sys/file.h> X #else X #include <fcntl.h> X*************** X*** 1358,1364 **** X char save[PATHLEN]; X int pid; X X! #if !defined(VMS) && !defined(MSDOS) X if (Crypt) { X return (cwritefile(fname, r0, c0, rn, cn)); X } X--- 1358,1364 ---- X char save[PATHLEN]; X int pid; X X! #if !defined(VMS) && !defined(MSDOS) && defined(CRYPT_PATH) X if (Crypt) { X return (cwritefile(fname, r0, c0, rn, cn)); X } X*************** X*** 1408,1414 **** X (void) strcpy(save,fname); X } X X! #if !defined(VMS) && !defined(MSDOS) X if (Crypt) { X creadfile(save, eraseflg); X return; X--- 1408,1414 ---- X (void) strcpy(save,fname); X } X X! #if !defined(VMS) && !defined(MSDOS) && defined(CRYPT_PATH) X if (Crypt) { X creadfile(save, eraseflg); X return; X*************** X*** 1675,1681 **** X } X X /* expand a ~ in a path to your home directory */ X! #if !defined(MSDOS) X #include <pwd.h> X #endif X char * X--- 1675,1681 ---- X } X X /* expand a ~ in a path to your home directory */ X! #if !defined(MSDOS) && !defined(VMS) X #include <pwd.h> X #endif X char * X*************** X*** 1698,1704 **** X if ((*pathptr == '/') || (*pathptr == '\0')) X { strcpy(tmppath, HomeDir); X } X! #if !defined(MSDOS) X else X { struct passwd *pwent; X extern struct passwd *getpwnam(); X--- 1698,1704 ---- X if ((*pathptr == '/') || (*pathptr == '\0')) X { strcpy(tmppath, HomeDir); X } X! #if !defined(MSDOS) && !defined(VMS) X else X { struct passwd *pwent; X extern struct passwd *getpwnam(); X*** 618/crypt.c Thu Sep 26 10:38:48 1991 X--- crypt.c Thu Sep 26 10:17:27 1991 X*************** X*** 2,10 **** X * Encryption utilites X * Bradley Williams X * {allegra,ihnp4,uiucdcs,ctvax}!convex!williams X! * $Revision: 6.17 $ X */ X X #include <stdio.h> X #include <curses.h> X X--- 2,12 ---- X * Encryption utilites X * Bradley Williams X * {allegra,ihnp4,uiucdcs,ctvax}!convex!williams X! * $Revision: 6.19 $ X */ X X+ #if !defined(VMS) && !defined(MSDOS) && defined(CRYPT_PATH) X+ X #include <stdio.h> X #include <curses.h> X X*************** X*** 189,191 **** X--- 191,194 ---- X return(0); X } X X+ #endif /* CRYPT_PATH */ X*** 618/format.c Thu Sep 26 10:39:43 1991 X--- format.c Thu Sep 26 10:31:21 1991 X*************** X*** 3,9 **** X * Mark Nagel <nagel@ics.uci.edu> X * 20 July 1989 X * X! * $Revision: 6.18 $ X * X * bool X * format(fmt, num, buf, buflen) X--- 3,9 ---- X * Mark Nagel <nagel@ics.uci.edu> X * 20 July 1989 X * X! * $Revision: 6.19 $ X * X * bool X * format(fmt, num, buf, buflen) X*** 618/help.c Thu Sep 26 10:39:46 1991 X--- help.c Thu Sep 26 10:17:31 1991 X*************** X*** 2,13 **** X * Help functions for sc X * R. Bond, 1988 X * J. Buhrt 1990 X! * $Revision: 6.18 $ X */ X X #ifdef QREF X #include <stdio.h> X! char *header = " Quick Reference\n\n$Revision: 6.18 $"; X #else X #include <curses.h> X #include "sc.h" X--- 2,13 ---- X * Help functions for sc X * R. Bond, 1988 X * J. Buhrt 1990 X! * $Revision: 6.19 $ X */ X X #ifdef QREF X #include <stdio.h> X! char *header = " Quick Reference\n\n$Revision: 6.19 $"; X #else X #include <curses.h> X #include "sc.h" X*************** X*** 49,55 **** X--- 49,59 ---- X " l Autolabeling defined cells enable/disable.", X " n If enabled, a digit starts a numeric value.", X " t Top line display enable/disable.", X+ #if !defined(VMS) && !defined(MSDOS) && defined(CRYPT_PATH) X " x Encrypt/decrypt database and listing files.", X+ #else X+ " x Encrypt/decrypt database and listing files (Not available).", X+ #endif X " $ Dollar prescale. If enabled, all numeric constants", X " (not expressions) entered are multipled by 0.01.", X " r Newline action. Toggle between no action, move down", X*** 618/interp.c Thu Sep 26 10:39:50 1991 X--- interp.c Thu Sep 26 10:17:39 1991 X*************** X*** 7,17 **** X * X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X! * $Revision: 6.18 $ X */ X X #define DEBUGDTS 1 /* REMOVE ME */ X! X #include <sys/types.h> X #ifdef aiws X #undef _C_func /* Fixes for undefined symbols on AIX */ X--- 7,17 ---- X * X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X! * $Revision: 6.19 $ X */ X X #define DEBUGDTS 1 /* REMOVE ME */ X! X #include <sys/types.h> X #ifdef aiws X #undef _C_func /* Fixes for undefined symbols on AIX */ X*************** X*** 1879,1886 **** X--- 1879,1891 ---- X X if (isconstant) { X /* prescale input unless it has a decimal */ X+ #if defined(IEEE_MATH) && !defined(NO_FMOD) X if (!loading && (prescale < (double)0.9999999) && X (fmod(val, (double)1.0) == (double)0)) X+ #else X+ if (!loading && (prescale < (double)0.9999999) && X+ ((val - floor(val)) == (double)0)) X+ #endif X val *= prescale; X X v->v = val; X*** 618/lex.c Thu Sep 26 10:39:51 1991 X--- lex.c Thu Sep 26 10:17:41 1991 X*************** X*** 7,13 **** X * X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3/88, see list of changes. X! * $Revision: 6.18 $ X * X */ X X--- 7,13 ---- X * X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3/88, see list of changes. X! * $Revision: 6.19 $ X * X */ X X*************** X*** 34,39 **** X--- 34,43 ---- X #include <setjmp.h> X #include "sc.h" X #include <ctype.h> X+ X+ #ifdef NONOTIMEOUT X+ #define notimeout(a1, a2) X+ #endif X X #ifdef VMS X #include "gram_tab.h" X*** 618/psc.c Thu Sep 26 10:38:56 1991 X--- psc.c Thu Sep 26 10:31:19 1991 X*************** X*** 17,23 **** X * Author: Robert Bond X * Adjustments: Jeff Buhrt and Eric Putz X */ X! char *rev = "$Revision: 6.17 $"; X X #include <ctype.h> X #include <stdio.h> X--- 17,23 ---- X * Author: Robert Bond X * Adjustments: Jeff Buhrt and Eric Putz X */ X! char *rev = "$Revision: 6.19 $"; X X #include <ctype.h> X #include <stdio.h> X*** 618/range.c Thu Sep 26 10:38:57 1991 X--- range.c Thu Sep 26 10:31:17 1991 X*************** X*** 4,10 **** X * X * Robert Bond, 4/87 X * X! * $Revision: 6.17 $ X */ X X #include <sys/types.h> X--- 4,10 ---- X * X * Robert Bond, 4/87 X * X! * $Revision: 6.19 $ X */ X X #include <sys/types.h> X*** 618/sc.c Thu Sep 26 10:39:52 1991 X--- sc.c Thu Sep 26 15:21:29 1991 X*************** X*** 8,14 **** X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X * Currently supported by sequent!sawmill!buhrt (Jeff Buhrt) X! * $Revision: 6.18 $ X * X */ X X--- 8,14 ---- X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X * Currently supported by sequent!sawmill!buhrt (Jeff Buhrt) X! * $Revision: 6.19 $ X * X */ X X*************** X*** 67,72 **** X--- 67,75 ---- X int numeric; X char *mdir; X int showsc, showsr; /* Starting cell for highlighted range */ X+ #ifdef RIGHT_CBUG X+ int wasforw = FALSE; X+ #endif X X void update(); X void repaint(); X*************** X*** 96,102 **** X #endif X X extern int lastmx, lastmy; /* Screen address of the cursor */ X! extern int lastcol, cols; /* Spreadsheet Column the cursor was in last */ X X /* a linked list of free [struct ent]'s, uses .next as the pointer */ X struct ent *freeents = NULL; X--- 99,105 ---- X #endif X X extern int lastmx, lastmy; /* Screen address of the cursor */ X! extern int lastcol, lcols; /* Spreadsheet Column the cursor was in last */ X X /* a linked list of free [struct ent]'s, uses .next as the pointer */ X struct ent *freeents = NULL; X*************** X*** 206,213 **** X--- 209,220 ---- X #if defined(MSDOS) X if ((revi = strrchr(argv[0], '\\')) != NULL) X #else X+ #ifdef VMS X+ if ((revi = strrchr(argv[0], ']')) != NULL) X+ #else X if ((revi = strrchr(argv[0], '/')) != NULL) X #endif X+ #endif X progname = revi+1; X else X progname = argv[0]; X*************** X*** 405,410 **** X--- 412,420 ---- X numeric_field = 0; X } X forwcol(arg); X+ #ifdef RIGHT_CBUG X+ wasforw++; X+ #endif X break; X X case ctl('g'): X*************** X*** 1194,1200 **** X break; X #endif X case 'L': X! forwcol(cols-(curcol-stcol)+1); X break; X case ' ': X case 'l': X--- 1204,1210 ---- X break; X #endif X case 'L': X! forwcol(lcols -(curcol-stcol)+1); X break; X case ' ': X case 'l': X*************** X*** 1416,1422 **** X for (r=r1; r<=r2; r++) X for (c=c1; c<=c2; c++) { X p = *ATBL(tbl, r, c); X! if (p->flags&is_locked) X return(1); X } X return(0); X--- 1426,1432 ---- X for (r=r1; r<=r2; r++) X for (c=c1; c<=c2; c++) { X p = *ATBL(tbl, r, c); X! if (p && (p->flags & is_locked)) X return(1); X } X return(0); X*** 618/sc.h Thu Sep 26 10:39:53 1991 X--- sc.h Thu Sep 26 10:32:49 1991 X*************** X*** 6,12 **** X * University of Maryland X * R. Bond 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X! * $Revision: 6.18 $ X * X */ X X--- 6,12 ---- X * University of Maryland X * R. Bond 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X! * $Revision: 6.19 $ X * X */ X X*** 618/screen.c Thu Sep 26 10:39:54 1991 X--- screen.c Thu Sep 26 15:21:27 1991 X*************** X*** 8,14 **** X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X * Currently supported by sequent!sawmill!buhrt (Jeff Buhrt) X! * $Revision: 6.18 $ X * X */ X X--- 8,14 ---- X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X * Currently supported by sequent!sawmill!buhrt (Jeff Buhrt) X! * $Revision: 6.19 $ X * X */ X X*************** X*** 16,21 **** X--- 16,26 ---- X #include <curses.h> X #include "sc.h" X X+ #ifdef VMS X+ extern int VMS_read_raw; /*sigh*/ X+ VMS_read_raw = 1; X+ #endif X+ X #ifdef BROKENCURSES X /* nl/nonl bug fix */ X #undef nl X*************** X*** 30,36 **** X char mode_ind = '.'; X extern char revmsg[]; X X! int rows, cols; X int lastmx, lastmy; /* Screen address of the cursor */ X int lastcol; /* Spreadsheet Column the cursor was in last */ X extern int *fwidth; X--- 35,41 ---- X char mode_ind = '.'; X extern char revmsg[]; X X! int rows, lcols; X int lastmx, lastmy; /* Screen address of the cursor */ X int lastcol; /* Spreadsheet Column the cursor was in last */ X extern int *fwidth; X*************** X*** 37,42 **** X--- 42,50 ---- X extern int showrange; /* Causes ranges to be highlighted */ X extern int showneed; /* Causes cells needing values to be highlighted */ X extern int showexpr; /* Causes cell exprs to be displayed, highlighted */ X+ #ifdef RIGHT_CBUG X+ extern int wasforw; /* Causes screen to be redisplay if on lastcol */ X+ #endif X X /* X * update() does general screen update X*************** X*** 69,77 **** X X /* First see if the last display still covers curcol */ X if (stcol <= curcol) { X! for (i = stcol, cols = 0, col = RESCOL; X (col + fwidth[i]) < COLS-1 && i < maxcols; i++) { X! cols++; X X if (col_hidden[i]) X continue; X--- 77,85 ---- X X /* First see if the last display still covers curcol */ X if (stcol <= curcol) { X! for (i = stcol, lcols = 0, col = RESCOL; X (col + fwidth[i]) < COLS-1 && i < maxcols; i++) { X! lcols++; X X if (col_hidden[i]) X continue; X*************** X*** 78,88 **** X col += fwidth[i]; X } X } X! while (stcol + cols - 1 < curcol || curcol < stcol) { X FullUpdate++; X if (stcol - 1 == curcol) { /* How about back one? */ X stcol--; X! } else if (stcol + cols == curcol) { /* Forward one? */ X stcol++; X } else { X /* Try to put the cursor in the center of the screen */ X--- 86,96 ---- X col += fwidth[i]; X } X } X! while (stcol + lcols - 1 < curcol || curcol < stcol) { X FullUpdate++; X if (stcol - 1 == curcol) { /* How about back one? */ X stcol--; X! } else if (stcol + lcols == curcol) { /* Forward one? */ X stcol++; X } else { X /* Try to put the cursor in the center of the screen */ X*************** X*** 96,104 **** X } X } X /* Now pick up the counts again */ X! for (i = stcol, cols = 0, col = RESCOL; X (col + fwidth[i]) < COLS-1 && i < maxcols; i++) { X! cols++; X if (col_hidden[i]) X continue; X col += fwidth[i]; X--- 104,112 ---- X } X } X /* Now pick up the counts again */ X! for (i = stcol, lcols = 0,col = RESCOL; X (col + fwidth[i]) < COLS-1 && i < maxcols; i++) { X! lcols++; X if (col_hidden[i]) X continue; X col += fwidth[i]; X*************** X*** 148,154 **** X } X lastcurrow = currow; X } X! mxcol = stcol + cols - 1; X mxrow = strow + rows - 1; X X /* Get rid of cursor standout on the cell at previous cursor position */ X--- 156,162 ---- X } X lastcurrow = currow; X } X! mxcol = stcol + lcols - 1; X mxrow = strow + rows - 1; X X /* Get rid of cursor standout on the cell at previous cursor position */ X*************** X*** 189,194 **** X--- 197,208 ---- X (void) printw("%-*d", RESCOL, i); X row++; X } X+ #ifdef RIGHT_CBUG X+ if(wasforw) { X+ clearok(stdscr, TRUE); X+ wasforw = 0; X+ } X+ #endif X (void) move(2,0); X (void) printw("%*s", RESCOL, " "); X X*** 618/version.c Thu Sep 26 10:39:54 1991 X--- version.c Thu Sep 26 10:18:47 1991 X*************** X*** 4,7 **** X * The part after the first colon, except the last char, appears on the screen. X */ X X! char *rev = "$Revision: 6.18 $"; X--- 4,7 ---- X * The part after the first colon, except the last char, appears on the screen. X */ X X! char *rev = "$Revision: 6.19 $"; X*** 618/vi.c Thu Sep 26 10:39:55 1991 X--- vi.c Thu Sep 26 10:18:04 1991 X*************** X*** 1,7 **** X /* SC A Spreadsheet Calculator X * X * One line vi emulation X! * $Revision: 6.18 $ X */ X X #include <sys/types.h> X--- 1,7 ---- X /* SC A Spreadsheet Calculator X * X * One line vi emulation X! * $Revision: 6.19 $ X */ X X #include <sys/types.h> X*************** X*** 112,117 **** X--- 112,118 ---- X case 'i': u_save(c); insert_mode(); break; X case 'j': for_hist(); break; X case 'k': back_hist(); break; X+ case ' ': X case 'l': linelim = for_line(0); break; X case 'n': search_again(); break; X case 'q': stop_edit(); break; X*** 618/vmtbl.c Thu Sep 26 10:39:02 1991 X--- vmtbl.c Thu Sep 26 10:31:04 1991 X*************** X*** 8,14 **** X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X * Currently supported by sequent!sawmill!buhrt (Jeff Buhrt) X! * $Revision: 6.17 $ X * X */ X #ifdef PSC X--- 8,14 ---- X * More mods Robert Bond, 12/86 X * More mods by Alan Silverstein, 3-4/88, see list of changes. X * Currently supported by sequent!sawmill!buhrt (Jeff Buhrt) X! * $Revision: 6.19 $ X * X */ X #ifdef PSC X*** 618/xmalloc.c Thu Sep 26 10:39:02 1991 X--- xmalloc.c Thu Sep 26 10:31:15 1991 X*************** X*** 1,6 **** X /* X * A safer saner malloc, for careless programmers X! * $Revision: 6.17 $ X */ X X #include <stdio.h> X--- 1,6 ---- X /* X * A safer saner malloc, for careless programmers X! * $Revision: 6.19 $ X */ X X #include <stdio.h> SHAR_EOF $TOUCH -am 0926152291 pch618-619 && chmod 0666 pch618-619 || echo "restore of pch618-619 failed" set `wc -c pch618-619`;Wc_c=$1 if test "$Wc_c" != "27397"; then echo original size 27397, current size $Wc_c fi # ============= build.com ============== echo "x - extracting build.com (Text)" sed 's/^X//' << 'SHAR_EOF' > build.com && X$! VMS command file to build SC and PSC (requires bison) on VMS X$! SC: X$! $Revision: 6.19 $ X$! bison -d gram.y X$! ren gram_tab.c gram.c X$ cc'p1' /define=("SIMPLE","SIGVOID") sc.c X$ cc'p1' /define=("SIMPLE","SIGVOID") gram.c X$ cc'p1' /define=("SIMPLE","SIGVOID") lex.c X$ cc'p1' /define=("SIMPLE","SIGVOID","RINT") interp X$ cc'p1' /define=("SIMPLE","SIGVOID") cmds X$ cc'p1' /define=("SIMPLE","SIGVOID") xmalloc X$ cc'p1' /define=("SIMPLE","SIGVOID") range X$ cc'p1' /define=("SIMPLE","SIGVOID") help X$ cc'p1' /define=("SIMPLE","SIGVOID") vmtbl X$ cc'p1' /define=("SIMPLE","SIGVOID") screen X$ cc'p1' /define=("SIMPLE","SIGVOID") vi X$ cc'p1' /define=("SIMPLE","SIGVOID") format X$ link'p1' sc.obj,lex.obj,gram.obj,interp.obj,cmds.obj,xmalloc.obj,- X range.obj,help.obj,vmtbl.obj,screen.obj,vi.obj,format.obj,- X sys$library:vaxccurse.olb/lib,- X sys$library:vaxcrtl/shar X$ ! X$ ! Create VMS foreign command symbol to test SC X$ ! X$ sc == "$" + f$logical("SYS$DISK") + f$directory() + "SC.EXE" X$! X$! Now PSC X$! X!$ cc'p1' psc.c X!$ cc'p1' getopt.c X$ link'p1' psc,getopt,vmtbl.obj,xmalloc.obj,screen.obj,vi.obj,format.obj,- X sys$library:vaxccurse.olb/lib,- X sys$library:vaxcrtl/shar X$ ! X$ ! Create VMS foreign command symbol to test PSC (Note that X$ ! PSC reads SYS$INPUT and writes to SYS$OUTPUT, so use X$ ! DEFINE/USER to redirect.) X$ ! X$ psc == "$" + f$logical("SYS$DISK") + f$directory() + "PSC.EXE" SHAR_EOF $TOUCH -am 0926105391 build.com && chmod 0444 build.com || echo "restore of build.com failed" set `wc -c build.com`;Wc_c=$1 if test "$Wc_c" != "1437"; then echo original size 1437, current size $Wc_c fi exit 0 exit 0 # Just in case... -- Kent Landfield INTERNET: kent@sparky.IMD.Sterling.COM Sterling Software, IMD UUCP: uunet!sparky!kent Phone: (402) 291-8300 FAX: (402) 291-4362 Please send comp.sources.misc-related mail to kent@uunet.uu.net.